api/eqpt_views.py

@@ -220,7 +220,7 @@ def get_screen_data(point=None, point_id=None):

                         status=True,
              

                     ).values('macid', 'temperature', 'updated_at')
              

                     temperature_logs = {log.get('macid'): log.get('temperature') for log in logs}
              

                -    time_logs = {log.get('macid'): log.get('updated_at') for log in logs}
              

                +    time_logs = {log.get('macid'): tc.local_string(utc_dt=log.get('updated_at'), format='%m-%d %H:%M') for log in logs}
              

                 
              

                     ipuis = IsolationPointUserInfo.objects.filter(point_id=point.point_id, status=True).values('pk', 'fields', 'observed_days')
              

                     # ipuis = {info.get('pk'): {'fields': info.get('fields'), 'observed_days': info.get('observed_days')} for info in ipuis}
              
@@ -258,9 +258,9 @@ def get_screen_data(point=None, point_id=None):

                         'phone': eqpt.get('phone', ''),
              

                         'sex': eqpt.get('sex', ''),
              

                         'age': eqpt.get('age', ''),
              

                -        'temperature': eqpt.get('temperature', '') or get_old_temperature(eqpt.get('point_id', ''), eqpt.get('macid', '')),
              

                         'status': '已上报' if eqpt.get('temperature') else '未上报',
              

                         'last_report_time': time_logs.get(eqpt.get('macid', ''), '') if eqpt.get('temperature') else eqpt.get('last_submit_at', ''),
              

                +        'temperature': eqpt.get('temperature', '') or get_old_temperature(eqpt.get('point_id', ''), eqpt.get('macid', '')),
              

                         'observed_days': eqpt.get('observed_days', 0),
              

                     } for eqpt in eqpts]